From e6d46ec5ad88f6382190e543496aba30a84051c5 Mon Sep 17 00:00:00 2001
From: Arnaud Bonatti <arnaud.bonatti@gmail.com>
Date: Sat, 7 Nov 2020 11:24:19 +0100
Subject: [PATCH] Teach `gtk-builder-tool` to rewrite <requires>.

---
 gtk/tools/gtk-builder-tool-simplify.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index d40556b0cb..9e3324306d 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -1635,6 +1635,14 @@ rewrite_scale (Element      *element,
     }
 }
 
+static void
+rewrite_requires (Element      *element,
+                  MyParserData *data)
+{
+  if (has_attribute (element, "lib", "gtk+"))
+    set_attribute_value (element, "lib", "gtk");
+}
+
 static void
 rewrite_overlay (Element      *element,
                  MyParserData *data)
@@ -1978,6 +1986,9 @@ rewrite_element (Element      *element,
       property_has_been_removed (element, data))
     return TRUE;
 
+  if (g_str_equal (element->element_name, "requires"))
+    rewrite_requires (element, data);
+
   return FALSE;
 }
 
-- 
2.30.2